Use gtk_widget_is_focus() instead of GTK_WIDGET_HAS_FOCUS. (#122327, Owen

Thu Nov 20 15:48:03 2003  Soeren Sandmann  <sandmann@daimi.au.dk>

	* gtk/gtksocket.c (gtk_socket_focus): Use gtk_widget_is_focus()
	instead of GTK_WIDGET_HAS_FOCUS. (#122327, Owen Taylor. Reported
	by Frederic Crozat).

diff --git a/ChangeLog b/ChangeLog
index d87c7e9fcadf8da0b8944a988bc47351f0cd5104..7e17bda3edcd4e55933ff740ef666f0bf6ffec29 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Thu Nov 20 15:48:03 2003  Soeren Sandmann  <sandmann@daimi.au.dk>
+
+       * gtk/gtksocket.c (gtk_socket_focus): Use gtk_widget_is_focus()
+       instead of GTK_WIDGET_HAS_FOCUS. (#122327, Owen Taylor. Reported
+       by Frederic Crozat).
+
 Thu Nov 20 13:10:29 GMT 2003  Tony Gale <gale@gtk.org>
 
        * docs/faq/gtk-faq.sgml: Update Section 3 to 2.x

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index d87c7e9fcadf8da0b8944a988bc47351f0cd5104..7e17bda3edcd4e55933ff740ef666f0bf6ffec29 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,9 @@
+Thu Nov 20 15:48:03 2003  Soeren Sandmann  <sandmann@daimi.au.dk>
+
+       * gtk/gtksocket.c (gtk_socket_focus): Use gtk_widget_is_focus()
+       instead of GTK_WIDGET_HAS_FOCUS. (#122327, Owen Taylor. Reported
+       by Frederic Crozat).
+
 Thu Nov 20 13:10:29 GMT 2003  Tony Gale <gale@gtk.org>
 
        * docs/faq/gtk-faq.sgml: Update Section 3 to 2.x

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index d87c7e9fcadf8da0b8944a988bc47351f0cd5104..7e17bda3edcd4e55933ff740ef666f0bf6ffec29 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,9 @@
+Thu Nov 20 15:48:03 2003  Soeren Sandmann  <sandmann@daimi.au.dk>
+
+       * gtk/gtksocket.c (gtk_socket_focus): Use gtk_widget_is_focus()
+       instead of GTK_WIDGET_HAS_FOCUS. (#122327, Owen Taylor. Reported
+       by Frederic Crozat).
+
 Thu Nov 20 13:10:29 GMT 2003  Tony Gale <gale@gtk.org>
 
        * docs/faq/gtk-faq.sgml: Update Section 3 to 2.x

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index d87c7e9fcadf8da0b8944a988bc47351f0cd5104..7e17bda3edcd4e55933ff740ef666f0bf6ffec29 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,9 @@
+Thu Nov 20 15:48:03 2003  Soeren Sandmann  <sandmann@daimi.au.dk>
+
+       * gtk/gtksocket.c (gtk_socket_focus): Use gtk_widget_is_focus()
+       instead of GTK_WIDGET_HAS_FOCUS. (#122327, Owen Taylor. Reported
+       by Frederic Crozat).
+
 Thu Nov 20 13:10:29 GMT 2003  Tony Gale <gale@gtk.org>
 
        * docs/faq/gtk-faq.sgml: Update Section 3 to 2.x

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index d87c7e9fcadf8da0b8944a988bc47351f0cd5104..7e17bda3edcd4e55933ff740ef666f0bf6ffec29 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,9 @@
+Thu Nov 20 15:48:03 2003  Soeren Sandmann  <sandmann@daimi.au.dk>
+
+       * gtk/gtksocket.c (gtk_socket_focus): Use gtk_widget_is_focus()
+       instead of GTK_WIDGET_HAS_FOCUS. (#122327, Owen Taylor. Reported
+       by Frederic Crozat).
+
 Thu Nov 20 13:10:29 GMT 2003  Tony Gale <gale@gtk.org>
 
        * docs/faq/gtk-faq.sgml: Update Section 3 to 2.x

diff --git a/gtk/gtksocket.c b/gtk/gtksocket.c
index 0c3068ae03d7b22874087a61b6b2f85486abe294..3a76cfbe50fe877cb3c90fd65dca5e8d81949320 100644 (file)
--- a/gtk/gtksocket.c
+++ b/gtk/gtksocket.c
@@ -840,7 +840,7 @@ gtk_socket_focus (GtkWidget *widget, GtkDirectionType direction)
   if (socket->plug_widget)
     return gtk_widget_child_focus (socket->plug_widget, direction);
 
-  if (!GTK_WIDGET_HAS_FOCUS (widget))
+  if (!gtk_widget_is_focus (widget))
     {
       switch (direction)
        {